Fixes ADE-95

Summary

Describe the change.

What Changed

Key files and behaviors.

Validation

How you tested.

Risks

Anything to watch.

Linked Linear issues

• ADE-95: Pulling main from Git actions pane can kill active sessions - closes on merge

  Open in ADE  ·  ade-95-pulling-main-from-git-actions-pane-can-kill-active-sessions branch  ·  PR #511

Summary by CodeRabbit

• New Features

  • Auto-rebase now pauses when lanes have active chat or terminal sessions, preventing operations during user interaction.
  • Auto-rebase blocks descendant lanes when ancestor lanes have active sessions.
  • Added fallback handling for activity status verification failures.

• Tests

  • Added test coverage for auto-rebase session-activity gating and blocking behavior.

Greptile Summary

This PR gates the auto-rebase cascade on active chat and terminal session counts, preventing a git pull from silently rebasing a lane while a user is interacting with it. When sessions are present, the lane is set to rebasePending with an informational message, and all descendants are similarly blocked.

• autoRebaseService.ts: Adds getLaneActivity hook (optional), normalizeActivityCount helper, and getAutoRebaseActivityBlock to pause or surface lookup errors; both new blockedMessage reasons (active_session, activity_lookup) propagate the block to descendant lanes.
• bootstrap.ts / main.ts: Wire the activity providers behind an autoRebaseActivityReady flag, then call refreshActiveRebaseNeeds(\"activity_services_ready\") to re-evaluate any lanes that were gated during startup.
• Tests: Four new scenarios cover session-present blocking, lookup failures, malformed/negative counts, and multi-level ancestor propagation.

Confidence Score: 5/5

The change is safe to merge; new session-activity gating is additive and the service falls back gracefully when the activity provider is absent or throws.

The activity-gating logic is well-isolated behind an optional callback, error paths are caught and converted to a safe pending state rather than allowing an unguarded rebase, edge-case inputs (NaN, negative counts) are normalised correctly, and four targeted test cases verify each new code path. No data loss or incorrect rebase can result from this change.

No files require special attention.

Important Files Changed

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[onHeadChanged / refreshActiveRebaseNeeds] --> B[processRoot: build cascadeOrder]
    B --> C{For each lane in cascade}
    C --> D{blocked flag set?}
    D -- Yes --> E[setStatus rebasePending\nblockedMessage ancestor reason]
    D -- No --> F{rebaseMode === manual?}
    F -- Yes --> G[blocked=true, reason=manual]
    G --> C
    F -- No --> H{getLaneActivity provided?}
    H -- No --> K[proceed to rebase]
    H -- Yes --> I[getAutoRebaseActivityBlock]
    I --> J{activity lookup}
    J -- Throws --> L[blocked=true\nreason=activity_lookup\n'could not verify']
    J -- activeSessions > 0 --> M[blocked=true\nreason=active_session\n'Auto-rebase paused']
    J -- No sessions --> K
    L --> C
    M --> C
    K --> N[laneService.rebaseStart]
    N --> O{Error?}
    O -- Yes --> P[blocked=true\nconflict or failed]
    O -- No --> Q[laneService.rebasePush → autoRebased]
    P --> C
    Q --> C

_{Reviews (4): Last reviewed commit: "Refs ADE-95: Fix activity refresh promis..." | Re-trigger Greptile}